Use non recursive automake for JS

Use only one Makefile for all JS module, to make faster builds and
to increase maintenability.

https://bugzilla.gnome.org/show_bug.cgi?id=629775

diff --git a/configure.ac b/configure.ac
index f3b1a45fb60afb39f24fddd8360f26fcd0e194bd..65a5b6059661afba9d0eef5df01f2b613c411f20 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -166,10 +166,6 @@ AC_CONFIG_FILES([
   Makefile
   data/Makefile
   js/Makefile
-  js/misc/Makefile
-  js/ui/Makefile
-  js/perf/Makefile
-  js/prefs/Makefile
   src/Makefile
   tests/Makefile
   po/Makefile.in

diff --git a/js/Makefile.am b/js/Makefile.am
index 142793cf64f3ea419e8855a4d180da2544105a98..f0efa291fa753a2d1232f246c850c83ad9d40cc8 100644 (file)
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -1 +1,48 @@
-SUBDIRS = misc ui perf prefs
+
+jsdir = $(pkgdatadir)/js
+
+nobase_dist_js_DATA =  \
+       misc/docInfo.js         \
+       misc/format.js          \
+       misc/gnomeSession.js    \
+       misc/params.js          \
+       misc/telepathy.js       \
+       perf/core.js            \
+       prefs/clockPreferences.js \
+       ui/altTab.js            \
+       ui/appDisplay.js        \
+       ui/appFavorites.js      \
+       ui/boxpointer.js        \
+       ui/calendar.js          \
+       ui/chrome.js            \
+       ui/dash.js              \
+       ui/dnd.js               \
+       ui/docDisplay.js        \
+       ui/environment.js       \
+       ui/extensionSystem.js   \
+       ui/genericDisplay.js    \
+       ui/lightbox.js          \
+       ui/link.js              \
+       ui/lookingGlass.js      \
+       ui/magnifier.js         \
+       ui/magnifierDBus.js     \
+       ui/main.js              \
+       ui/messageTray.js       \
+       ui/notificationDaemon.js \
+       ui/overview.js          \
+       ui/panel.js             \
+       ui/panelMenu.js         \
+       ui/placeDisplay.js      \
+       ui/popupMenu.js         \
+       ui/runDialog.js         \
+       ui/scripting.js         \
+       ui/search.js            \
+       ui/shellDBus.js         \
+       ui/statusMenu.js        \
+       ui/telepathyClient.js   \
+       ui/tweener.js           \
+       ui/windowAttentionHandler.js    \
+       ui/windowManager.js     \
+       ui/workspace.js         \
+       ui/workspacesView.js    \
+       ui/workspaceSwitcherPopup.js
\ No newline at end of file

diff --git a/js/misc/Makefile.am b/js/misc/Makefile.am
deleted file mode 100644 (file)
index 9baf8af..0000000
--- a/js/misc/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-jsmiscdir = $(pkgdatadir)/js/misc
-
-dist_jsmisc_DATA =             \
-       docInfo.js              \
-       format.js               \
-       gnomeSession.js         \
-       params.js               \
-       telepathy.js

diff --git a/js/perf/Makefile.am b/js/perf/Makefile.am
deleted file mode 100644 (file)
index e3dedc0..0000000
--- a/js/perf/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-jsperfdir = $(pkgdatadir)/js/perf
-
-dist_jsperf_DATA =             \
-       core.js

diff --git a/js/prefs/Makefile.am b/js/prefs/Makefile.am
deleted file mode 100644 (file)
index a1e0c47..0000000
--- a/js/prefs/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-jsprefsdir = $(pkgdatadir)/js/prefs
-
-dist_jsprefs_DATA =            \
-       clockPreferences.js

diff --git a/js/ui/Makefile.am b/js/ui/Makefile.am
deleted file mode 100644 (file)
index b9b2241..0000000
--- a/js/ui/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-jsuidir = $(pkgdatadir)/js/ui
-
-dist_jsui_DATA =               \
-       altTab.js               \
-       appDisplay.js           \
-       appFavorites.js         \
-       boxpointer.js           \
-       calendar.js             \
-       chrome.js               \
-       dash.js                 \
-       dnd.js                  \
-       docDisplay.js           \
-       environment.js          \
-       extensionSystem.js      \
-       genericDisplay.js       \
-       lightbox.js             \
-       link.js                 \
-       lookingGlass.js         \
-       magnifier.js            \
-       magnifierDBus.js        \
-       main.js                 \
-       messageTray.js          \
-       notificationDaemon.js   \
-       overview.js             \
-       panel.js                \
-       panelMenu.js            \
-       placeDisplay.js         \
-       popupMenu.js            \
-       runDialog.js            \
-       scripting.js            \
-       search.js               \
-       shellDBus.js            \
-       statusMenu.js           \
-       telepathyClient.js      \
-       tweener.js              \
-       windowAttentionHandler.js \
-       windowManager.js        \
-       workspacesView.js       \
-       workspaceSwitcherPopup.js \
-       workspace.js